Skip to content

[6.2] fix build system tests that assume CMake is in the search path #84253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Sep 12, 2025
Merged

[6.2] fix build system tests that assume CMake is in the search path #84253

merged 2 commits into from
Sep 12, 2025

Conversation

@edymtt
Copy link
Contributor

@edymtt edymtt commented Sep 12, 2025 •
edited
Loading

  • Explanation:
    Backport two changes from main to ensure that a couple build system tests do not fail if CMake is built from source code as part of the build-script invocation (as that's currently the case for some bots in CI).
  • Scope:
    Tests that need to know the path to CMake.
  • Issues: rdar://160182427
  • Original PRs:
    for Python/swift_build_support.swift -- 4e854de
    for BuildSystem/build_worktree.test-- [test] Pass cmake location to build-script invocation in test #83577
  • Risk:
    Low -- these changes only affect test code
  • Testing:
    Ensured at desk tests pass when CMake is built as part of build-script
  • Reviewers: none at this time

edymtt and others added 2 commits September 12, 2025 00:43
@edymtt
[6.2] Do not require CMake to be in the path for build-script tests
f17d890 
(cherry picked from commit 4e854de)
@AnthonyLatsis @edymtt
[6.2][test] Pass cmake location to build-script invocation in test
5324f20 
The test fails without it if CMake is not in the path (and Xcode does
not find an instance either)

(cherry picked from commit 54322b2)
@edymtt edymtt requested a review from shahmishal September 12, 2025 08:12
@edymtt edymtt requested a review from a team as a code owner September 12, 2025 08:12
@edymtt
Copy link
Contributor Author

edymtt commented Sep 12, 2025

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented Sep 12, 2025

@swift-ci please test Apple Silicon

@edymtt edymtt changed the title [6.2] fix build system tests that assumes CMake is in the search path [6.2] fix build system tests that assume CMake is in the search path Sep 12, 2025
@edymtt
Copy link
Contributor Author

edymtt commented Sep 12, 2025 •
edited
Loading

The Apple Silicon bot is failing, but not on the tests I addressed

[2025-09-12T09:20:01.849Z] Failed Tests (1):
[2025-09-12T09:20:01.849Z]   Swift(macosx-arm64) :: stdlib/Mirror.swift

@edymtt edymtt enabled auto-merge September 12, 2025 12:13
@edymtt edymtt merged commit cff1969 into swiftlang:release/6.2 Sep 12, 2025
5 of 6 checks passed
@edymtt edymtt deleted the edymtt/fix-build-system-test-failures-6.2 branch September 15, 2025 05:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shahmishal shahmishal shahmishal approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@edymtt @shahmishal @AnthonyLatsis